This repository has been archived by the owner on Nov 22, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 52
occamy: Support for remote quadrants and other occamygen additions #345
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
huettern
requested review from
niwis,
GiannaP,
lucabertaccini and
paulsc96
as code owners
February 22, 2022 15:12
huettern
force-pushed
the
remote-quadrants
branch
from
February 22, 2022 15:26
bbc288d
to
2d4e5a2
Compare
Signed-off-by: Noah Huetter <noahhuetter@gmail.com>
huettern
force-pushed
the
remote-quadrants
branch
from
February 23, 2022 13:02
19e5d4d
to
292d37c
Compare
huettern
commented
Feb 23, 2022
hw/system/occamy/src/occamy_quadrant_s1_ctrl/occamy_quadrant_s1_reg.hjson
Show resolved
Hide resolved
...s/pulp_platform_common_cells/0005-common_cells-Exclude-cb_filter-from-vivado-IP-packag.patch
Show resolved
Hide resolved
huettern
force-pushed
the
remote-quadrants
branch
from
February 23, 2022 13:10
292d37c
to
45f3c71
Compare
huettern
force-pushed
the
remote-quadrants
branch
from
February 23, 2022 15:11
0aefa4a
to
c3560dc
Compare
paulsc96
approved these changes
Feb 23, 2022
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👍 There are some places where RTL generation leaves comments related to remote cluster / quadrant generation; these could be conventionalized, but that is not a necessity.
Can't do better than some empty lines ;) thanks for the review! |
paulsc96
changed the title
Support for remote quadrants and other occamygen additions
occamy: Support for remote quadrants and other occamygen additions
Feb 23, 2022
paulsc96
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
paulsc96
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345](#345s)) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
paulsc96
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
colluca
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
paulsc96
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
paulsc96
pushed a commit
to pulp-platform/snitch_cluster
that referenced
this pull request
Jul 11, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
colluca
pushed a commit
to pulp-platform/occamy
that referenced
this pull request
Aug 19, 2023
…ulp-platform/snitch#345) * add name parameter for output files Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * change include file to svh header extension Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * expose remote quadrant AXI ports Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder optional ATOP in emit_flat_port Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add id_deprepend to AXI bus Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder change_iw to emit an assign if target iw match Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder add axi mux and demux Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * prefix all generated modules with custom name Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen add support for remote quadrants Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * parametrizable number of outstanding transactions in the DMA network Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen RMQ address fix Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * quadrant reset POR value to 0 (quadrant in reset) Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * solder: Add ID Prepend and emit if id change to larger ID Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * occamygen: Adapt remote quadrants to new SoC structure Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Remove cb_filter from Xilinx IP packager because it causes problems Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * Move cuts to configuration file Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * [occamy] regenerate sources * Parametrizable transactions in SoC interconnect Signed-off-by: Noah Huetter <noahhuetter@gmail.com> * re-vendor * lint python sources * cleanup * 16 outstanding transactions on the quadrant networks * re-generate memories with python3.9 * make snitch_cluster AXI transactions configurable through clustergen * schema doc * dont emit comments if no remote quadrants configured
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary of changes
occamygen
: Addname
argument tooccamygen
that defaults tooccamy
. This is especially helpful when generating different occamy systemsoccamygen
: Remote quadrants: Configurable amount of remote quadrants that are attached to the wide and narrow network. If parametrized to no remote quadrants, the RTL does not change (except some comments)solder
: Optional ATOP inemit_flat_port
for Xilinx wrappersolder
: Addid_deprepend
modulesolder
:change_iw
to emit an assign if source and destination IW matchsolder
: Addaxi_mux
andaxi_demux
occamygen
: Parametrizable number of outstanding transactions on the DMA networkquadrant_ctrl
: Quadrants held in reset after PORsolder
:change_iw
to emit anid_prepend
ifto IW
>from IW
cut
parameters to configToDo
Comment
I don't intend to cleanup this PR before you agree on merging these changes. Please let me know if you intend to merge, I'll then fix the regressions.